From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 20 Oct 2025 10:26:50 +0000 (+0200)
Subject: prepare-root: Fix crash if no valid signatures
X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2^2~5^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=ceb7193e831688d46179dc913f110ce9197d5906;p=ostree.git

prepare-root: Fix crash if no valid signatures

We didn't set error if there were zero valid signatures, which caused
a crash prefixing the error. While fixing this, the error messages were
slightly reworded to make it nicer.
---

diff --git a/src/libotcore/otcore-prepare-root.c b/src/libotcore/otcore-prepare-root.c
index a628b880..89844f03 100644
--- a/src/libotcore/otcore-prepare-root.c
+++ b/src/libotcore/otcore-prepare-root.c
@@ -419,7 +419,7 @@ validate_signature (GBytes *data, GVariant *signatures, GPtrArray *pubkeys, GErr
         }
     }
 
-  return FALSE;
+  return glnx_throw (error, "No valid (of %" G_GSIZE_FORMAT ") signatures found", g_variant_n_children (signatures));
 }
 
 // Output a friendly message based on an errno for common cases
@@ -641,7 +641,7 @@ otcore_mount_rootfs (RootConfig *rootfs_config, GVariantBuilder *metadata_builde
 
       g_autoptr (GBytes) commit_data = g_variant_get_data_as_bytes (commit);
       if (!validate_signature (commit_data, signatures, rootfs_config->pubkeys, error))
-        return glnx_prefix_error (error, "No valid signatures found for public key");
+        return glnx_prefix_error (error, "Checking commit signature");
 
       ot_journal_print (LOG_INFO, "composefs+ostree: Validated commit signature using '%s'",
                         composefs_pubkey);